merge trunk
authorKenichi Handa <handa@m17n.org>
Mon, 8 Nov 2010 05:19:24 +0000 (14:19 +0900)
committerKenichi Handa <handa@m17n.org>
Mon, 8 Nov 2010 05:19:24 +0000 (14:19 +0900)

Trivial merge